# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1496.1.12 -> 1.1496.1.13 # arch/ia64/Makefile 1.61 -> 1.62 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/12/17 davidm@tiger.hpl.hp.com 1.1504 # Merge tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5 # into tiger.hpl.hp.com:/data1/bk/lia64/linux-ia64-2.5 # -------------------------------------------- # 03/12/19 peterc@gelato.unsw.edu.au 1.1496.1.13 # [PATCH] ia64: enable out-of-tree compilation for IA64 # # -------------------------------------------- # diff -Nru a/arch/ia64/Makefile b/arch/ia64/Makefile --- a/arch/ia64/Makefile Sat Dec 20 00:39:33 2003 +++ b/arch/ia64/Makefile Sat Dec 20 00:39:33 2003 @@ -14,7 +14,7 @@ OBJCOPYFLAGS := --strip-all LDFLAGS_vmlinux := -static -LDFLAGS_MODULE += -T arch/ia64/module.lds +LDFLAGS_MODULE += -T $(srctree)/arch/ia64/module.lds AFLAGS_KERNEL := -mconstant-gp EXTRA := @@ -25,9 +25,9 @@ GCC_VERSION=$(shell $(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.') GCC_MINOR_VERSION=$(shell $(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f2 -d'.') -GAS_STATUS=$(shell arch/ia64/scripts/check-gas $(CC) $(OBJDUMP)) +GAS_STATUS=$(shell $(srctree)/arch/ia64/scripts/check-gas $(CC) $(OBJDUMP)) -CPPFLAGS += $(shell arch/ia64/scripts/toolchain-flags $(CC) $(OBJDUMP)) +CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags $(CC) $(OBJDUMP)) ifeq ($(GAS_STATUS),buggy) $(error Sorry, you need a newer version of the assember, one that is built from \ @@ -88,12 +88,15 @@ prepare: include/asm-ia64/offsets.h -include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s +arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h + +include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s $(call filechk,gen-asm-offsets) arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp include/asm-ia64/.offsets.h.stamp: + mkdir -p include/asm-ia64 [ -s include/asm-ia64/offsets.h ] \ || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/offsets.h touch $@